From 765f653df620c7e9a83c637c7e9d88e19c7b2ea8 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Sat, 6 Nov 2010 12:36:05 +0100 Subject: [PATCH] GtkSymbolicColor: Only require styleproperties when resolving named colors. It is not necessary for resolving colors based on literals, so be a bit less strict here. --- gtk/gtksymboliccolor.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gtk/gtksymboliccolor.c b/gtk/gtksymboliccolor.c index d2506dc4e5..cb5a9191b0 100644 --- a/gtk/gtksymboliccolor.c +++ b/gtk/gtksymboliccolor.c @@ -488,7 +488,6 @@ gtk_symbolic_color_resolve (GtkSymbolicColor *color, GdkRGBA *resolved_color) { g_return_val_if_fail (color != NULL, FALSE); - g_return_val_if_fail (GTK_IS_STYLE_PROPERTIES (props), FALSE); g_return_val_if_fail (resolved_color != NULL, FALSE); switch (color->type) @@ -500,6 +499,8 @@ gtk_symbolic_color_resolve (GtkSymbolicColor *color, { GtkSymbolicColor *named_color; + g_return_val_if_fail (GTK_IS_STYLE_PROPERTIES (props), FALSE); + named_color = gtk_style_properties_lookup_color (props, color->name); if (!named_color) -- 2.30.2